Merge branch 'cargo_pkg_version' of https://github.com/wesleywiser/cargo into pr...
authorAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:52:38 +0000 (11:52 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:52:38 +0000 (11:52 -0800)

Trivial merge